Issue #1675522 by tim.plunkett, dewalt: Remove button broken if form is rebuilt (via ajax or failed validation)