back to what it was a long time ago
scripted update of code from master at 7b0e6d5 back to what it was a long time ago