Cherry picked "fixed build" from theme