This reverts commit 005f4a75e1. There might be however old profiles/documents with this behavior. Let's revert for now. Change-Id: I2ee26287b7bd64e01a9b6b0a9586d70e63b9c83d
005f4a75e1