Revert "--amend"

This reverts commit 6d422761b4a8c6f3a6a3805a03fe9dd0d686b03b.
Revert 'Try to convert software surface directly when created'