Revert "Built from ed9da20de2587c8cf468466813a3b76443250534."

This reverts commit 84a64fbd85cc1094495920097df905ab052a6b55.