Well, time to finally fork this for real instead of not sharing my local changes.