Revert "Revert "Leftovers""

This reverts commit 8cfea3b929085c4fe2f84722bbb0c459b0d501f6.