Revert some changes that snuck in