Updated to upstream behaviour.