Revert 1ec4e97..fa101d1

This rolls back to commit 1ec4e9716890c3c1a0d71cd4f41e1eaebe15c264.