As noted on IRC 4.10-rc2 w/ drm-next-4.10-wip and 4.10-rc3 w/ drm-next-4.11-wip do not require this commit to be reverted. Hibernate (freeze), Resume (thaw) seem to work fine here, keeping ticket open for further testing.