Merge "Remove workaround Jack bug on package renaming"