Fixes #4613 for real.

It turns out that you need the ajax calls, and the system wasn't
designed for non-ajax deletes.