This reverts commit bde04780. Reason for revert: It's possible we broke functionality. Reverting pending investigation. Change-Id: I358aa0c1ae88970949dfb173ff1ba9914d95f915