Revert "Do issue #2?"

This reverts commit a086229da052b33e1287173ae79de2eae32aeacf.