Revert 3045d1a..bd7da99

This rolls back to commit 3045d1a295fee2e2cd374d621a629e0ba6809e6e.