Fixes #2408. Message-Id: <20170524080729.10085-1-avi@scylladb.com> (cherry picked from commit 15af6acc8b)
15af6acc8b