Revert some changes from 2025365b46