Remove current partial fixes for edit mode.