Refactoring to prevent RhBug: 1144741