Bug 854980 - Rewrite tabs without traits

WIP