Revert 9b9f674..cb96ddd

This rolls back to commit 9b9f6743dfdd44a626f6b068e0e9686e1180d2d2.