Revert 805906a..030f9ba

This rolls back to commit 805906a9854f48d66ee3500c5ffd8f748dbd2092.