Use the default template on new pages rather than builder template

We don't want to force this decision on the user. Many times it
is useful to just have a normal page.
Merge branch 'builder-disable'