This reverts commit df6255a0. Reason for revert: Breaks git master Test: manual confirm Change-Id: Ifd8f437dce826fe7d8f875fc838a250fc010049a