Another merging derp we have with 4.4.1