#76 back out workaround in 1.2 branch