Pages with template chooser work again. Fixes #1942.