Reviewed r/3268 and r/3267