Merge back to 'default'.

Had to merge changes one-by-one since there were conflicting, hard to resolve
changes made upstream. (The worst of the conflicts were backed out, making it
even more confusing...)