Revert "Initial v5 commit"

This reverts commit f4e8bbd47df2f233d184ca443cfd226e600af77d.