5c3314a632
This reverts commit 3f4bb0443e96e9b7d04e3e4e77a8bb4e8647e01e. Fixes LP Bug #1211778. Change-Id: I254995a1bf5416fb70fbcac28ee399b1373efde7