Revert "Fix a bad merge"

This reverts commit 3f3f2140.

Reason for revert: Need a different approach to landing this.
                   Perhaps can do it without merged-in

Change-Id: I6971df7f99956afc0b27c0b2248df378666cedc8
Merged-In: I1138079b1ae05248cefa211e0597fd6723a8bbba