Revert "fixup! split_draft sub class"

This reverts commit 9301836ce90fef31b7b23afabdc729fe2146ea76.
Fix crud test