Backout bug 903401 for fps regression on the contacts app