Fails compiling docs. This reverts commit b0bd8915. Change-Id: I47d32525c83a73118e2163eb58c68bbb7a28bb38