Revert "Hopefully fixed f_endOnCas..."

This reverts commit 82780ff471619435d79c7fde2eb417e1e3fd276c.
Fixed for derped up commit