Revert "getting tristan's bug fix"

This reverts commit f3ca2aaf4a064258fd581ab83c53c4ad0d576780.
Reverting the commit