revert to spark-based edit mode entity markers for the time being