Revert "Uplift bug 912010, 928281 and 931977"

This reverts commit cce2ba1312b9a1fa534f446a46981d7ce6ee38fe, reversing
changes made to 90d2ede90cb19a7d1986950012b15c7024022205.