Revert 6f9110d..0bc99d6

This rolls back to commit 6f9110d94f1ac8ffcb7e740a3fbe58160babdb32.