Make compatible with rust as of 20140212