Revert 4494f12..c3a816e

This rolls back to commit 4494f12f92da989dc98218f06f197928e0a88c40.
0929Final!

2 IAP bugs fixed