Changes to use stock RVM..