Removed incorrect csrf hacks in favor of c039c5e.