Revert 'Merger pull request #28 from lblpbd/onestop/forms'