This reverts commit e84a738432. The problem this addresses was fixed in bc0c1b74c7.
e84a738432
bc0c1b74c7