reverting changes of SUP-1937 pullrequest