This reverts commit a029f1f0. This commit was not meant to be included in the 0.90 branch. Change-Id: I5b252f2603a7554efab2b997faaf2b59d62ee3cd