Revert "Remove obsolete stuff that make dirty logcat"

This reverts commit 7ee213c34ddbb1d4da480c9344a1972764b57b3f.