Conflicted with showmarks in an ugly way This reverts commit 44a2cd79d09aea86c464d4880d5fdfe8b378d7ce.