[Core] Get rid of a dumb workaround