Revert a couple LSB compilation breakers;