Revert "Bug #482 Fix: Interfaces stacked in template edit"

This reverts commit ee4acc5e88d9408ffea891113cf6bbf68f030c94.