Rollback some changes made in 3bb2c8fa413c8