Merge "Partially revert commit ff5659fbc3026e621bdd926e96096e2957cfd42e."