Commit to undo 91bc06f3ce24d6d9c899fc24900efa84944346fe

Original way was more appropriate