This reverts commit 552de999bfe660cbf88eb9b1ce19e55b2f6b3d92. Playing a bit of back-and-forth with this one :-)