Into account the wishes of #99#discussion_r3040225