Revert "Changed the way "reloading" works to get the upgrade from 1.6.11 to 2.0.0 working more smoothly"

This reverts commit 914159f96a12f24ee2bf0f6796bd880ffa26d3dd.