Revert cc5cd49..6127034

This rolls back to commit cc5cd4925ad8018e60d46053d52ca1c5a712e20a.
Fixed defn error with camel