Revert 28787c3..6225708

This rolls back to commit 28787c3cf4a3350a8dd9b986437ede8cbf4b3945.