This is somewhat evil, but should get us back into the state we were in
before. There are probably other bugs lurking here as well, though,
related to other cases where we don't support relative positioning. We
really just need to make our relative positioning support more general.
