Revert 79091d5..8edd34e

This rolls back to commit 79091d5c8f0a303cee20bc5a22889af963bca99c.