Revert "oom diagnostic logging"

This reverts commit 1447b38816ddcad61e1b1393a55a9b7602c193c3.
Auto-merge remote-tracking branch 'upstream/master'