Merge "Revert^2 "Compiler changes for bitstring based type checks.""