Revert "Improve findBitmap"

This reverts commit 066a9df492d9ed6042405576025aa251b73b75fe.