two birds, one stone, but one bird being not a real actual bird
scripted update of code from master at 562d487 two birds, one stone, but one bird being not a real actual bird