Revert package exception stuff