Revert pull #139 for now (sorry!)