Revert "Marker fix 2"

This reverts commit 25c0f6f64689a2541edf68321899226fc087a870.
Revert "Revert "Marker fix 2""

This reverts commit e8c080ac2636c9514aed16e4c7f9dbce2407ce51.