BZ-0000: Revert changes