This reverts commit cebb55ea. Reason for revert: broke docs builds Change-Id: I3a4b8d274141efec90fae2ed0b9324194288c635