Revert to Pipelinerard aokp defaults

Revert to Pipelinerard aokp defaults