Merge "Revert changes from 792a960b2e3404235b4b195edb8333cd57372b90."