Workaround bootstrap problems on Xcode 5.x (temporary fix for now)