Henry, I think Hafeez's patched version of your patch has the ad-style patch :)
Would you please coordinate this with him and come up with one tarball that we can keep on the contrib section of openacs.org? I will give you permissions to write over it. I made a readme for Hafeez's patch on the tarball that's in the contrib code right now. It explains what the files are and how to install them. You could included that in the tarball too.
My tarball is at the /new-file-storage on openacs.org.
Thanks.