Remove the workaround that is not needed as the code has been fixed.