Reverts last commit and fixes bounced function reloading.