Just kidding we do want this to work like it used to. This reverts commit e354a9e4. Change-Id: Ia51050a93e25c1ad16144b0da3f6178a98ad971a