Revert accbd3b..2952955

This rolls back to commit accbd3ba168208a1adee7ef2d68175121ee8974a.