Revert d096be2..5ea75e2

This rolls back to commit d096be23d109ce451c7af7d59b66f3555f63883c.