Revert "Work in progress. Very difficult!"

This reverts commit 9794cd671b11dc2578c5df2c0aa00f1f3288ebf1.