Partial revert of r243782 to restore previous behavior