Restore equivalence of .firstObject after changes in commit 7962a2