Revert 1944c32..4117962

This rolls back to commit 1944c32f187796cc487bea3729fce9705c66f74e.