revert part of 0f1c7b1d7107 which broke lots of stuff based on region selection