Merge "Revert "Fully support static encoded fields.""