reorder dependencies to work-around bundler bug