* Revert r66878, completely misses the point of factoring out doEdit() in the first...