Revert "Merge pull request #12911 from lissyx/bug906296"

This reverts commit b9520ca7b28e469c91efd851e7af9ad7b38ee3ed, reversing
changes made to bc2fb252092af20050551ecbd7c5a3edab77b58e.