Remove a workaround that's not needed anymore. Taken from MC.