This reverts commit c6a3e02b4b7af75341c573340ef11baef8bee39d partially. Presumably, some unwanted modifications also found its way in with above patch breaking the app. Revert problematic pieces.
This reverts commit c6a3e02b4b7af75341c573340ef11baef8bee39d partially. Presumably, some unwanted modifications also found its way in with above patch breaking the app. Revert problematic pieces.