Revert previous commit due to incomplete replacement.
This reverts commit 003427ac669b86b749bfc5ba2dbf4294851a8286.