Reverted aap changes