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