Bring in my previous changes to my original fork of the original project.