Reverted non-necessary changes for issue fix