This is a follow-up to #1381.
This is a follow-up to #1381.