Yea, that would be preferred, thanks! If you want to submit another PR, that'd be swell too :), preferably against master (I don't think this is a regression we should concern ourselves with in 2-stable). If you don't want to submit a PR, could you open an issue and describe the solution?