Now, seriously, is that hack still needed? I understand it was needed during early time when you developed this branch, but what about now? With all the changes it had over time when you last worked on it?