Revert 925cbf1..86fcf74

This rolls back to commit 925cbf1a5be99f7912df33eb0c8c6bff52911c2e.