Revert df0827f93b78c419c8826c9e5c07ca21720a3bce

Reverts "Fixes bug 913126, fixes bug 917025 - Made rapid betas work in all search-based systems. r=brandonsavage"