Revert "Merge pull request #298 from jcheng5/remove-catools"

This reverts commit 0ad9a5f9c6b4c888af555d55354dc8d45313c3a8, reversing
changes made to c31d91668a3bd2bc59db78063dfafb78df3e896a.