Replaced inline remap.