Revert d824fa3..93547b8

This rolls back to commit d824fa387834b94f8f15ec70c1f3b1cfdfe6c95b.