Revert "V07"

This reverts commit 41ca6e24460b993e101b8acf0ec7f59a046f5e29.