Revert r37490, 37493 for now -- 'NotifyOnPageChangeComplete hook added'