Not going to wait 100 years for CM to merge a patch...