This reverts commit a22b7e05. Reason for revert: This is a roll forwards with the fix applied. Fixes: 208710019 Change-Id: Id4e9029ebe5864ddcc5583ce525e8e70da79f82c