Undid 8ba2caebd8 and db9816f027