Remove the workaround