This reverts commit f9b62aaa. No longer needed, for explanation see: bug: 15110978 Change-Id: Ia6bffd39304d8078f9fb6071b1fe14cd56a483a0