Revert 758b98a..d70b0f3

This rolls back to commit 758b98a3f7e73c6aed66b6980938b9891c156c38.