Undid previous 'fix', as it broke things. Updated design doc.