Reverted change. Compiler still keeps sneaking byte operations in there.