Partialy revert 7cbbe6b