Revert "Fixing catkinization and params bug"

This reverts commit 5d722ec8fbb5bda0f915c08f65e4ef2eeaf2b727.