trying to goddamn cherrypick
Fixing of merge snafus.