Revert "Final version for now."

This reverts commit 49c8b5fab5ea74370347defcc2a325254f807d64.