Restoring some data commited earlier from felixkat