Reverted modules from 4c4dcf5aa74274e2137c27b44c07602f1e0d9ae by fixing concat/module define