Revert 7e4d964..47c9517

This rolls back to commit 7e4d9649991570ab1dfd036595cad049d11bdc9b.