revert so I can readd with module-tag