Revert "Revert "Rebuilt changes""

This reverts commit d68fcd878bbe47b7ee8ea25deb3fffa0dc68f2ad.