REVERT: Reverting some work because the whole timing change was just stupid.

Will have to re-add the bonus database.