Revert all other changes and make export an extra module.