Revert "base/platform: Remove code duplication"