I've dealt with this in a separate clean PR for the new behaviour as of 2014/02/27