Undo r414123

The Test Suite caught a few problems, undoing until those are resolved


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@414138 f38db490-d61c-443f-a65b-d21fe96a405b