Probably swatting a fly with a sledgehammer, but this should fix
the bootstrap changes from Mario in core.