Revert f92533c..40e84c7

This rolls back to commit f92533c71cab9a04c3ad4db541b5f36b6536d46a.