"Revert "Remove some rebuilt stuff"

This reverts commit 52971291fab1855deab2f9f3ce5905b138a5b589.