Merge "Remove usused workaround."