Follow up to #370.