Fixed bug in r49227; use raw function now