This reverts commit 7edbae7b4c.
7edbae7b4c
#1387
#1335
Co-authored-by: MystiPanda <mystipanda@proton.me>