Remove patch: Change merged to CM that does this.