This reverts commit 5388baa0a1. Closes-Bug: #1447940 Change-Id: I333a731f6bc169b46b86fded1572baca1516ce8f
5388baa0a1