Patched a few things and added this as a configurable feature.