Decided to just leave, it'll match the 3.4 implementation better.