Revert "Final working version."

This reverts commit 4f1d310181b60fe7ef87a554daabb31f13526ef0.