Reverted mortar logic