Revert 8e30580..7aa3a22

This rolls back to commit 8e305807e26f4169a0c8525c016b6cc017fd9f82.