Replace old rhel module by cleaned up external one