Revert "Suggested updates: avoid code duplication in retrieving platform type"

This reverts commit 8d9e831f8cd50d915ed96888e806b393eac40979.