Revert "OKAY. NO CHOICE BUT TO HACK! Straight in the success handler"

This reverts commit 46b477799ce4ceec5e9e0bfdae0f0db0a9b561fb.