Revert "Merge branch 'callback-error' into Bootstrap-theme"

This reverts commit 9c0e898154880598bacb31430a69f58ba480ef1c, reversing
changes made to 76a66d256045d4f4fb2f22c88c790b01c54a0961.