Revert 4ee8a9a..ef55807

This rolls back to commit 4ee8a9a5334ac3b68386eb4a9a6d5703f35092ca.