This reverts commit 65bfc1396e. The 1.8.1 image is published now, so we can finally upgrade.
65bfc1396e