This reverts commit ae218b85ff084ce0f5a49f69e3684c486ad6bb42 [formerly b57904d64f0fbdd2e97f0326de4378489206e357], reversing
changes made to cda2232080d6eefb0b2fa3c9e028c50023bac6b7 [formerly 6949fe847d9c4181c924a13ed0715ecd71b98499].
Former-commit-id: 0261bc7735663dba45681a5c0e4026b4c1fddeba