Bug 1083572 - Apply some make black magic to make the fix actually work