Revert "Cleanup for deprecated HWC versions"

This reverts commit 2aa0657f7b368f510cefa2465edc46e65a52467b.