WordPress treats autosave as current revision in page editor when using Make

I really love Theme Foundry’s Make theme, and am currently using it on 4 sites including waffleparty.com and davewheitner.com. However, I’m presently having an odd issue.

The reason I’m wondering if this could be theme-related is that I don’t have these issues when I temporarily switch to the Twenty Sixteen or Twenty Fourteen theme on one of my lower traffic sites. Also possibly related: When I’m in those themes, I get the dialog box warning that any changes I made will be lost if I navigate away from the page without saving first. When using Make, however, I don’t get that dialog box upon leaving the edit page (even though I never check the box to suppress future messages, as I appreciate those warnings). I wonder if that’s somehow connected to the issues I describe below.

My key question here: I’m wondering how I can get the version in the WordPress page editor to match the version on the live page again, rather than reflecting the most recent autosave and treating that as the “current version.”

Detailed description of what I’m observing:

I make edits to a page, and do not save them before going to “preview page.” For example, I add the text “Happy birthday, John!”

After previewing the page, I decide I don’t wish to save those edits, so I close out of the preview page browser tab, and I then close out of the editor in the original browser tab by returning to the live page. Presumably, this ensures that the edits are not saved.

When I visit the live page, it still shows the proper current version. That is, it doesn’t include the “Happy birthday, John!” text addition that I merely previewed, but didn’t save.

However, when I return to edit the page some more, through the “edit page” button at the top of the live page, the version in the editor still includes “Happy birthday, John!” In other words, the version in the editor is an autosaved version, and not the current version.

The problem is that the interface treats the autosaved version in the editor as though it’s the current revision, even though it’s not. Above the autosaved version in the editor is a message stating that “There is an autosave of this post that is more recent than the version below. View the autosave.” This is even though it’s already showing me the autosave. When I go into the compare versions window, and I drag the timeline slider to what is actually the current version, the “restore this version” option grays out. Which makes sense, because the live version of the page is still the current revision. But the editor is not showing the current revision. So I have no way of getting back to edit the version that actually matches the live page, unless I manually undo any edits I previously made.

In other words, if I now make additional edits and then save the newly edited version, the live page will now also include “Happy birthday, John!” along with any other edits that I *didn’t* want to save following my prior preview. This also holds true with deleted items. If deleted a few items in the editor, they’ll still be deleted when I return to the editing screen, even if I previously closed out of the editor without saving those deletions.

So I have no way of making major edits and previewing them, without running the risk of having to manually undo all of them if I decide not to keep them.

I’ve tried the following so far, and none have helped:

-reading through the “READ THIS FIRST – WordPress 4.4 Master List” on WordPress support forums, to see if there’s anything I’ve neglected to try
-clearing all caches on my W3 caching plugin before re-entering the editor from the live page (memcached and object caching through host also deactivated)
-repairing the database tables from phpMyadmin
-adding lines into wp-config.php setting it to autosave only once per day, as well as turning off post revisions. But it still autosaves.
-doing hard browser refreshes of the live and editing pages following changes
-turning off all wordpress plugins while also placing Cloudflare in development mode to turn off all caching
-logging out of and back into wordpress, and then entering the edit page from the dashboard “pages” menu item, rather than from the “edit page” function at the top of the live page
-doing several of the above simultaneously (wp-config mods, all plugins and cloudflare off, browser refreshes)

I’ve observed this behavior on two different WordPress installations on the same host (A2Hosting).

Many thanks!