Reset back to c6d612a. DO NOT MERGE ANYWHERE.