This reverts commit dc4c3cfd78c01bef427fca0431fe66a6c6de7c35. Reverting because D143624 has been reverted.