A broken commit but I need this stuff elsewhere.