Revert some changes Jon committed by accident