missing check-in for #1594