Yet another pre-rewrite commit