Revert frame level fix