Pre-630 commit