Refactoring #4388s7427r7488