Restore freddyb's changes.