Roll back 3.x branch, 4.x for stevens things