Put back byte change; it doesn't require api-labs on classpath.