Revert some of William's changes