Undo tempory fix due to infinite inference recursion.
Merge pull request #218 from kmsquire/undo_temp_fix

Undo tempory fix due to infinite inference recursion.