re-added trac-original classes and ids