revert 22834c8 to 3.50

see commentas - it still might be worth to check this up deeper