Revert c42cd81..fb28d30

This rolls back to commit c42cd814dad33fb7974b2bbbc46e3c35d5fa4fa6.
Revert "Revert c42cd81..fb28d30"

This reverts commit 5f72efece8ffb7676c75115159b4812686920f49.