Revert "Fast fixation of the Bug: 57879"

This reverts commit 60a480c15b9e1af8926bb85f502987414292a4b0.

Please have a look to the bug tracker first. The bug was assigned and the bug already in review

Change-Id: I6972fb737cb994faad39002b8aa0fb9d8ab3eff9