This reverts commit 452b0acf09, reversing changes made to 0d1ec94548.
452b0acf09
0d1ec94548
Co-authored-by: Haris Rozajac <haris.rozajac12@gmail.com>