Revert "Revision 6.1"

This reverts commit 99472f71f55da04b474db3320f8dcb2b6811ad6e.