Revert f6174f6..ee6ff3d

This rolls back to commit f6174f6f6ada85240dee2bf36ad748d71ef1d70f.