ST2 compatibility restored

An afternoon tinkering with threads brings ST2 compatibility back. Woo!