Switch back to Ruby 1.9.3 and same changes as in wheezy branch