Revert "Allow CATS & Smokes to execute out of cf-release"

This reverts commit c53914ec6396fcd4922c3b914be874b7c2235a16.

Conflicts:
	src/smoke-tests