Revert d258476..5372a88

This rolls back to commit d2584769795d23d5d37057cd67df0e6eb8196d7d.