Import bundler_ext, update for EL7