[2.6] Looks like that is not necessary