Revert 4682969..4e30922

This rolls back to commit 46829697b93697a36904bd1b64be88060897dcff.