Lost an important dangling commit; re-stabilizing