Build changes from d7fb4d1.