Validation not bypassed correctly

In line 172, there's an attempt to bypass validation by setting some flags and NULLing some handlers. However, in line 190 there's a call to drupal_rebuild_form() which kinds of render the previous attempt moot.

Attached is a patch which attempts to resolve this issue. I hope it doesn't ruin anything :)