Revert "In progress."

This reverts commit 5f85443dfda053ae4778f43853fd37dba3b0f59d.