[BUGFIX] Added missing files from last revert.