Revert 7c344f5..2f170cb

This rolls back to commit 7c344f55c633d64307022055eaeef577e6f9f910.