Reverting r204968 and r204969; while more build bots are happy with the results, some still have link errors.