Seems we need this again....

Revert "Revert "Bugreport: fix it for now""

This reverts commit 8171b2960b6490a2940cccd70a70be5087e92146.

Change-Id: Icbe8a2b6a6611aee4d182f81f6bd4d51ae75f93f
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>