Undo the changes made to make TORQUE compatible with automake 1.14.1

There are a lot more changes required for full compatibility so I'm backing out the temporary changes for now as they make it so the unit tests can't be build. Until full compatibility can be reached I'm going to defer these changes.