Restore to commit 01cd86bba6dfda6c451de649414856a8077490d9.