Revert afdc602..b53a9fd

This rolls back to commit afdc6023b3d4248278f55c01a05f852435ba9339.
Revert "Revert afdc602..b53a9fd"

This reverts commit ce22f0c089ce5cb0b5c84bc60087e7daa5f34fde.