Removing usage of patching for now.