Merge "Remove ugly hack now that we're using newer mockito." into main