Revert change c285be3e0f05.

The results weren't quite the same. Mainly frames data.