Revert b761ca8..f6d2263

This rolls back to commit b761ca8de70a43dfac9fe51243f31c2fd651bf1e.