This is an update to a previous commit (r181216).