Merge "Revert 94479fd5405642c67efd14cebe722feb9cbe6e77"