Revert d0146e7..3034808

This rolls back to commit d0146e7031b679bca292a7a41021ae80f144922b.