Revert bug revert