Revert e3411b0..3070fe1

This rolls back to commit e3411b07c73f185c67495b0af1c2241e59cb122e.