backports as of April 14th 2014