Make draft editing work
Remove unnecessary hack