Partial reversion of 11 Oct 2013 change 3c96d69d. Fixes #80.