Changes for #454.