backtrack from attempted refactor
1 file changed