Revert "Dave Commit"

This reverts commit 013f7ee34fd0ce23a1b66081a39c757857f60cc2.