Template lookup order for baseof broken in 0.146?