Revert a7345cf..399e150

This rolls back to commit a7345cff700c86e5801581b194662c55033a9dbe.