WTF BBQ in merge, fix oddness

Change-Id: I3fd98c74e125baeecdadd4c948d9e0088a042e4c