[ros-diffs] [ekohl] 16297: Revert patch 16283 because it breaks PSDK compatibility.