Revert 5ec215e..69eb42d

This rolls back to commit 5ec215e6a96e3f5a0e83d5ef212435d049391aab.