Revert BTSX specific changes