Revert "Clean bits not yet merged into master."

This reverts commit c83394d46987f1041516676a2892baeed0882e65. Fixes regression #24.