taking it out
scripted update of code from master at 92150a1 taking it out