Revert 5da1b7f..5f970c3

This rolls back to commit 5da1b7f5483a117c30392ea9f6ea35b446c1b30c.