Co-Authored-By: Clarence K <clarencekuiek@proton.me>
This reverts commit 77c4792ac9.
77c4792ac9
Change-Id: Ib8493f164f12614e6d0a7ea5bd060d05991822b8