Resolve #1164 -- remove tidy.

This is #1164.