Revert "Fix mostRecentNotifPerThread error"

This reverts commit f4e321b4dfbd9f1b6007beca0c1c9f983657792e.
Okay rebase on Vanir

Change-Id: Iff54ae766865484e68b94b42c89bac7e660a241b