Revert 7cba3cb..4b4c300

This rolls back to commit 7cba3cbfbb463e24cfe73f116ea92a76f6da28b9.