Bug 3044 - Fix test breakage caused by remixedFrom