Revert c727704..ad1601c

This rolls back to commit c72770435c371abc4727a6bb9744ea60d0d5c663.