Changing the preview_template for something with a shelf results in two shelfs

![image](https://f.cloud.github.com/assets/21784/689454/6853a720-dab3-11e2-82db-34378f04cf2b.png)

The `change:preview_template` must be being fired before the code that removes the old shelf.  Rerendering fixes the problem.