Revert bddd124..3f98c20

This rolls back to commit bddd1246be3d4cde0a1acf0ea9a9bbfa7f7d82aa.
txt