revert some of casey's idosyncracies