Revert d434e72..a3d3d66

This rolls back to commit d434e720e07336742eb6a5e122dfe8b44cd0881e.