Removed patch from module, to be added in path enhacement branch