Yet another rebuild (since I keep dropping the damn thing).