Backing out the hack to see if I can get it to work;