diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
index 41fb48bf426..68d9df72b1f 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
@@ -385,7 +385,7 @@ public class AsmUtil {
         }
 
         if (containingDeclaration instanceof PackageFragmentDescriptor) {
-            return ACC_PUBLIC;
+            return NO_FLAG_PACKAGE_PRIVATE;
         }
         return null;
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt
index 2e172ce5749..9c42fa676e9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt
@@ -247,7 +247,7 @@ public fun Instruction.getPrimaryDeclarationDescriptorIfAny(bindingContext: Bind
 public val Instruction.sideEffectFree: Boolean
     get() = owner.isSideEffectFree(this)
 
-private fun Instruction.calcSideEffectFree(): Boolean {
+fun Instruction.calcSideEffectFree(): Boolean {
     if (this !is InstructionWithValue) return false
     if (!inputValues.all { it.createdAt?.sideEffectFree ?: false }) return false
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
index eb520c3ad74..1a828021afe 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
@@ -133,7 +133,7 @@ fun createQualifier(
     return qualifier
 }
 
-private fun QualifierReceiver.resolveAsStandaloneExpression(
+fun QualifierReceiver.resolveAsStandaloneExpression(
         context: ExpressionTypingContext,
         symbolUsageValidator: SymbolUsageValidator
 ): JetType? {
@@ -150,7 +150,7 @@ private fun QualifierReceiver.resolveAsStandaloneExpression(
     return null
 }
 
-private fun QualifierReceiver.resolveAsReceiverInQualifiedExpression(
+fun QualifierReceiver.resolveAsReceiverInQualifiedExpression(
         context: ExpressionTypingContext,
         symbolUsageValidator: SymbolUsageValidator,
         selector: DeclarationDescriptor?
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java
index bba05c3ae21..2b89e6a89ee 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java
@@ -55,11 +55,11 @@ public final class _DefaultPackage {
 
     @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt")
     @org.jetbrains.annotations.Nullable
-    public static final java.lang.String getPrivateN() { /* compiled code */ }
+    static final java.lang.String getPrivateN() { /* compiled code */ }
 
     @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt")
     @org.jetbrains.annotations.NotNull
-    public static final java.lang.String getPrivateNn() { /* compiled code */ }
+    static final java.lang.String getPrivateNn() { /* compiled code */ }
 
     @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt")
     @org.jetbrains.annotations.NotNull
@@ -89,5 +89,5 @@ public final class _DefaultPackage {
 
     @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt")
     @org.jetbrains.annotations.Nullable
-    public static final java.lang.String privateFun(@org.jetbrains.annotations.NotNull java.lang.String a, @org.jetbrains.annotations.Nullable java.lang.String b) { /* compiled code */ }
+    static final java.lang.String privateFun(@org.jetbrains.annotations.NotNull java.lang.String a, @org.jetbrains.annotations.Nullable java.lang.String b) { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxInline/modifiers/packagePrivateMembers.2.kt b/compiler/testData/codegen/boxInline/modifiers/packagePrivateMembers.2.kt
index fb63bc65db0..c8c03c723ac 100644
--- a/compiler/testData/codegen/boxInline/modifiers/packagePrivateMembers.2.kt
+++ b/compiler/testData/codegen/boxInline/modifiers/packagePrivateMembers.2.kt
@@ -1,8 +1,9 @@
 package test
 
-private val packageProp = "O"
+/*TODO rollback when supported*/
+/*private*/ val packageProp = "O"
 
-private fun packageFun() = "K"
+/*private*/ fun packageFun() = "K"
 
 internal inline fun packageInline(p: (String, String) -> String): String {
     return p(packageProp, packageFun())
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
index 8ca8649ef67..68b373128f7 100644
--- a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
+++ b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
@@ -30,12 +30,12 @@ import org.jetbrains.kotlin.psi.JetDotQualifiedExpression
 import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression
 import org.jetbrains.kotlin.psi.JetExpression
 
-private fun getReferenceExpression(element: PsiElement?): JetSimpleNameExpression? {
+fun getReferenceExpression(element: PsiElement?): JetSimpleNameExpression? {
     return PsiTreeUtil.getParentOfType<JetSimpleNameExpression>(element, javaClass<JetSimpleNameExpression>())
 }
 
 // given 'R.a.b' returns info for all three parts of the expression 'a', 'b', 'R'
-private fun getInfo(
+fun getInfo(
         referenceExpression: JetSimpleNameExpression,
         facet: AndroidFacet
 ): AndroidResourceUtil.MyReferredResourceFieldInfo? {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/changeSignatureUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/changeSignatureUtils.kt
index 983be4304b9..5b1d80d1148 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/changeSignatureUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/changeSignatureUtils.kt
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.types.TypeSubstitutor
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.types.substitutions.getCallableSubstitutor
 
-private fun JetNamedDeclaration.getDeclarationBody(): JetElement? {
+fun JetNamedDeclaration.getDeclarationBody(): JetElement? {
     return when {
         this is JetClassOrObject -> getDelegationSpecifierList()
         this is JetPrimaryConstructor -> getContainingClassOrObject().getDelegationSpecifierList()
diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/FormatHtmlUtil.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/FormatHtmlUtil.kt
index 489f41528b0..0135c0acdff 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/FormatHtmlUtil.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/FormatHtmlUtil.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.idea.highlighter.formatHtml
 
-private fun formatHtml(html: String): String {
+fun formatHtml(html: String): String {
     var message = html
     fun wrapTagWithNewLines(tagName: String, isSubTag: Boolean) {
         val openTagPart = "<$tagName"