Revert recent changes for now

These changes introduced some unexpected issues.