This reverts commit 8ba7f9f702.
8ba7f9f702
#544
#530
Co-authored-by: MystiPanda <mystipanda@proton.me>
#439
#444
#423 #424
#417