Updates to reflect upstream image repeating changes.