Use a symlink for lib.
Switch back to old version of onyx and layout.
Switch some paths back now that we're using a symlink for lib.