Merge "Revert "[DO NOT MERGE]""