I'm going to back out those changes for now and merge the other stuff. Then we can update the modules and see what remains to either patch locally or change upstream.