Revert "Fix 654"

Reverts kyeweedon/STDemo#1