Comment 7 for bug 1449283

While I think reverting the changes is a decent short term mitigation, it sounds like the long term solution is getting the authentication handler to work properly with 2.4.