Follow up to #4464 as discussed there.
Follow up to #4464 as discussed there.