Follow up to #3813.
Follow up to #3813.