Replaced #3088 with a better fix that relies on Interface Builder’s lack of support for conditional compilation.