I'm not convinced time is saved by not refactoring... but I wouldn't block this patch as a result.