Revert "Incorporated AP's latest changes."

This reverts commit a9cf16ab21615039ba51f384e797afc49fa930cb.