Re-implement DATASET-875, this time fixing dependencies on php-mysql too.