Revert 8412f1d..6e7742a

This rolls back to commit 8412f1d5e98d2a5299de366f13abac889917fa2e.