I get the feeling this change was not necessary ... right?