Revert "Revert "leftover changes""

This reverts commit 9216d887076947c77489502da82605ee3bbf5d02.