Revert d486ac6..93129f2

This rolls back to commit d486ac647853aa5a31a880a4b3c84e222578ce22.