Revert "catkinizing..."

This reverts commit 2be353df85a62424a63ee3a1539292f07f4c6a6a.