Reverse PR to get my build fixes