Revert "Prowl/Cat Form Fixes"

This reverts commit e574ba43a9c2c20d15e7f32735ce58cd5996933f.