revert attempt at 0.2 compatibility