remove attribute allocation hack
import merged package from Context