This reverts commit rB78bbf374f475 (and part of rB702d85d7cddbf81). Fix for this is actually simpler, done in next commit.