Reverted incorrect changes from 41b6aedf8cf78e731fffb392e7ca29f2103b60a9