Revert "Revision 8"

This reverts commit 71ffd5d7067067b45d0f8c8b0fd3da143200d19d.