Add support back for `collapsed` option.  It was broken a while ago.