Looks like this hack is not necessary