xplatform
Revert "xplatform"

This reverts commit 86bee7bcf8c91b2d827aa56ce0c6ef5ea59f77e8.