It was already there (but the imports reorg made it move...).

Would'nt it be better in another PR?