Revert "Merge conflict fixed."

This reverts commit 14ff60c27ae2c32f320cb7c8fe55dbad78c528da, reversing
changes made to 0af74c703c08f79b4075e1237a026d1d80b9e2a3.

Revert on merge.