This reverts commit 4565d632. No longer needed, for explanation see: bug: 15110978 Change-Id: If0a868b5893046aec323c376a60070303960442c