fix issue in previous release

The initial revert commit fixes the observed issue, but the reverted commit fixed a function that was clearly behaving incorrectly, and I'm pretty sure I made that change due to experiencing a bug caused by it when I was developing the last two plugins, so I think it might be worth it to QA this (it only really touches stuff involved with adding questions).  I've also tested it somewhat thoroughly.

Additionally, this should make large forms load a lot faster.

@ctsims