Revert 28644e8..89b46b4

This rolls back to commit 28644e8dd959107e5ea8ff21acea0e2d114d8a09.