This is not changed by me, this is like the old implementation. But you are right this is dirty.