Revert 467c7aa..2ffc6db

This rolls back to commit 467c7aa39cdc3d6ddb5244a67ac3a989c17b93a4.
test