more bindonce rollbacks... bo-if seems to work sometimes, othertimes not
Merge pull request #1892 from snicker/develop

more bindonce rollbacks... bo-if seems to work sometimes, othertimes not