Cherry picking fix to remove self as notfication observer (see upstream commit a140b00, March 13, 2014).