Revert c109f3d..d6b0129

This rolls back to commit c109f3dabbb3083b524bcb5cb7b716c20dfb755b.