Update  08f0dfe2bd to be ruby 1.9-compatible