Revert the callback system to the old one