Revert to working version from omegahat