Undeprecate some things until 2014.10