Another quick hack reverting a previous hack.