b58eb1bc63
This reverts commit e9e5e51d73.
Reason for revert: This change breaks image indicators feature
Fixes: 195665605
Change-Id: I2abff19955e1594a40f06bfb4972721eed1ee16f