Removed firstNonNull after merging upstream/master fix.