Re-added deleted code due to patch