Partial revert

Don't see the reason for the previous change.