Changed behaviour in last commit, restore previous behaviour as it's called in other scripts