Revert commits 9b9484ba + 87471cea

Way too spammy in syslog, something isn't right here

Change-Id: I03ffdad8b716dea9e0f01e8b6ed047c3654ce10a