category and page sharing permalink – broken

I’ve allways had some pages with the same permalink as some categories. Clicking the page-link in the menu or clicking on the category-link in a post or inte the category tree took me to the page and not the category post listing.

This has changed with 3.1 and I don’t know how to get it back.

Short:
If i have a page with permalink /mypermalink/
and a category with permalink /mypermalink/
I want wordpress to choose the page, not the category.