Merge pull request #74 from vikramrajkumar/btsx

Merge upstream
Revert upstream change