Revert "Work in progress."

This reverts commit 6a588f85ebcdb536ecef0245af007b70bc4c777a.