Revert accidental deletion from ffc5121c