Restore to encoder-testing version from Jan 29