Revert 41fe595..fdb45ae

This rolls back to commit 41fe595ad0557b7918c48a7d398d4bf2edafa56b.