Beta 017
Revert "Beta 017"

This reverts commit 56743b219ea32dd54dfbf6fe74d2da32ab9d683a.