Revert ae0cd19..35f1267

This rolls back to commit ae0cd194a2819e13de594951169bd99c5a0eafb4.