I mentioned in the main PR thread that it's OK in this place for now