Commits ade370a4 and e3fb74f7 were reordered while merging, so this change got lost.
ade370a4
e3fb74f7