Fixup last commit #495680c3d359e504186c

These changes should have been in the last commit too.