Revert 2 previvious commits.