Revert 0582cae..f8a7524

This rolls back to commit 0582cae2e6da030eb87540326bc3ab62d1e0b17a.