cherry picking
Source for buildrump.sh git rev ded9628f9987f82c3153c5e640cc81abf331a165