Revert 1114548..c2045d9

This rolls back to commit 1114548a17f97ea4e1f21012edb13385580c5542.