This reverts commit 9c4076a7. Cause crash when opening `contact request`. What was the initial commit for? GitLab: #1699 Change-Id: I6105c0a359504305f88f2e868ccdbe8cd837c210