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