Should have been part of 9aaf2ec8

Reviewed-by: dt
Reviewed: erikv, con