Remove workaround for issue 11939