Revert "Merge branch 'chilts-patch1'"

This reverts commit 288b6bf07b0e6b38d19fb5eb3d2e644cc5e445e9, reversing
changes made to eaa5b6c0b9d97da4acfbbfca41c6c2785ccac7d2.