The exception is caused by the changes from check-in [187e8cb03dd8b88f], which
occurred between and