Revert 2918288..4c2ef5f

This rolls back to commit 2918288369a90fa261cc79ebe3b262cd307e463f.