Revert "Merge branch 'nanoc'"

This reverts commit f3ba490fc32a27b5e72c2a735c809faf3f6477ae, reversing
changes made to 49985c489f9f3876272087c62ef751c33918ec8d.