Revert "Squashed update from 3.4.47 to 3.4.48 (Credits: arco)"

This reverts commit 68d3824ef28ddc0dfd45c36b0211b5aff84a036b.