warnings ftw (reverse-merged from commit f9e72bd95ea11d9e683a20abb937de5e3365f06c)