This reverts commit 6743f4b4b, restoring #1961.
6743f4b4b
Co-authored-by: aryan5v <email.aryan1005@gmail.com>