Good enough for 1.3; try to fix more cleanly for a future release (see
ticket 1583).