Revert to the old style/working style of callbacks