Revert "Mark Dexter patch"

This reverts commit 0f37a569a6a1666ebc24b3089c7778f1e96e018f.