Did not mean to add this.

This is already handled below, but differently in release-1.2
where I cherry picked this from.