Revert "Pulled down update to castrato"

This reverts commit fb3d14e4d3b6890fac3890b086774493aa658665.