fix (futurize) merge of changes in 707647c