This reverts commit a686b931. Reason for revert: breaks all the tests Change-Id: I800de434b6b4ecf0c132fb36025ab800ebe28b0f