Revert 22f1353..9ca14b2

This rolls back to commit 22f1353c085e8c3bbfe008903630ee4ae7fe4b49.