Merge "Remove resize-revert workaround for bug 924371"