Revert "OTG Header fix"

This reverts commit db191e408bd145a54b5addceabafc95dc5705efd.