Reverting [16376] in preparation for reverting [16356]. See #16182.
Reverting [16376] in preparation for reverting [16356]. See #16182.

git-svn-id: 4f9f921b081c523744c7bf24d959a0db39629563@16425 bcc190cf-cafb-0310-a4f2-bffc1f526a37

barseghyanartur/django-formtools,thenewguy/django-formtools,gchp/django-formtools,thenewguy/django-formtools,lastfm/django-formtools,barseghyanartur/django-formtools,gchp/django-formtools,lastfm/django-formtools