Revert "We don't need these"

This reverts commit a9bc26551f626be73900b6f8826d9eb14885c63c.