Revert 6ef807f..e22844b

This rolls back to commit 6ef807fd51d2678b50f9d5f921562de15cec9a37.