Revert "Further Crimson integration"

This reverts commit 7cc10e11a5a9f2ce78670275e3360a44b331d258.