Attempting another round of client / staging hacks