Revert 6a4d793..9f3d596

This rolls back to commit 6a4d793045cb484b4cfea3d7ca303caaea99dff9.