Put lines back which disappeared during commit 5b98571