Revert bugs