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