[3036] Partially revert [3033]

Thanks to @grz3s