Enable APZ
Drop workaround for 977015