Revert d4742e8..6f52148

This rolls back to commit d4742e851cd0549c5f2c9847670e99d7d21c4f06.