Restoring commit 4624a: bz899664