Revert "Roll back initial commit"

This reverts commit 0affcad457643e5942ff925a08db457494cf62f8.