Revert a7748d2..bf8f25a

This rolls back to commit a7748d25007b4adba8b48ca9b105def91f971dfd.