fix merge derp -- tad overconfident I was!

Change-Id: I22f12dab287c8e1a2ca1c69f8bf520c455f7c9ba