Broken update, bleeding edge.  Going to roll back to hard-code for now. :'(