revert the patch from Daniel Schepler and all follow-up attempts to