Revert ab5fff9..e6efdac

This rolls back to commit ab5fff9b85c41aa0401d075e4ced6937741aab95.