code review: reverted last change