Revert "test from Will branch"

This reverts commit 19786b5d435db5c9ea48ead200274fc1e2428f9c.