This reverts commit 9a8d916e.

Also some changes that were introduced after that commit are fixed to
use 1.2.17 instead of 1.3.0