This reverts commit a2c6a87a. Reason for revert: This was submitted only for testing purposes. Change-Id: I7cccec03763909417c209a9796343e4a0c83f54e