Remove obsolete workaround