Merge "Revert 776bd3e46c2fb5c003ecec4fee99f01943876644"