Fix compatibility with carrierwave master