Revert "almost final revision"

This reverts commit 6b56b14d3f292200ea3a721fba53780927ce8f25.