WhatsApp have address this issue so we no longer need the workaround. This reverts commit cdf3c4bc. Bug: 27353040 Change-Id: I41f68860bf04adcb231b316b0eaa3f32ba294ff7