issue: 2446 reverting changes made by commit f9a50ca8 since it looked like an error in merging