This reverts commit 3f4bb0443e. Fixes LP Bug #1211778. Change-Id: I254995a1bf5416fb70fbcac28ee399b1373efde7
3f4bb0443e