Revert d3e5107..a4af8fe

This rolls back to commit d3e5107e586733226fdbae803d1874a1666cc8a1.
Custom version for fit cause