diff --git a/core/modules/migrate/config/schema/migrate.data_types.schema.yml b/core/modules/migrate/config/schema/migrate.data_types.schema.yml
index d887785..9d11f41 100644
--- a/core/modules/migrate/config/schema/migrate.data_types.schema.yml
+++ b/core/modules/migrate/config/schema/migrate.data_types.schema.yml
@@ -27,6 +27,16 @@ migrate_source_sql:
     target:
       type: string
       label: 'The migration database target'
+    high_water_property:
+      type: mapping
+      label: 'High-water property'
+      mapping:
+        name:
+          type: string
+          label: Name
+        alias:
+          type: string
+          label: 'Table alias'
 
 migrate_load:
   type: migrate_plugin
diff --git a/core/modules/migrate/config/schema/migrate.schema.yml b/core/modules/migrate/config/schema/migrate.schema.yml
index 5157525..dce9978 100644
--- a/core/modules/migrate/config/schema/migrate.schema.yml
+++ b/core/modules/migrate/config/schema/migrate.schema.yml
@@ -16,6 +16,16 @@ migrate.migration.*:
     label:
       type: label
       label: 'Label'
+    highWaterProperty:
+      type: mapping
+      label: 'High-water property'
+      mapping:
+        name:
+          type: string
+          label: 'Field name'
+        alias:
+          type: string
+          label: 'Table alias'
     load:
       type: migrate.load.[plugin]
       label: 'Source'
diff --git a/core/modules/migrate/src/Entity/Migration.php b/core/modules/migrate/src/Entity/Migration.php
index e3f920c..3b460aa 100644
--- a/core/modules/migrate/src/Entity/Migration.php
+++ b/core/modules/migrate/src/Entity/Migration.php
@@ -156,7 +156,7 @@ class Migration extends ConfigEntityBase implements MigrationInterface, Requirem
    *
    * @var array
    */
-  protected $highWaterProperty;
+  protected $highWaterProperty = [];
 
   /**
    * Indicate whether the primary system of record for this migration is the
diff --git a/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
index 7a448f0..9b3cb85 100644
--- a/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
@@ -114,7 +114,6 @@ protected function prepareQuery() {
    */
   protected function initializeIterator() {
     $this->prepareQuery();
-    $high_water_property = $this->migration->get('highWaterProperty');
 
     // Get the key values, for potential use in joining to the map table, or
     // enforcing idlist.
@@ -173,15 +172,18 @@ protected function initializeIterator() {
       }
       // 3. If we are using high water marks, also include rows above the mark.
       //    But, include all rows if the high water mark is not set.
-      if (isset($high_water_property['name']) && ($high_water = $this->migration->getHighWater()) !== '') {
-        if (isset($high_water_property['alias'])) {
-          $high_water = $high_water_property['alias'] . '.' . $high_water_property['name'];
-        }
-        else {
-          $high_water = $high_water_property['name'];
+      if ($high_water_property = $this->migration->get('highWaterProperty')) {
+        if (isset($high_water_property['name']) && ($high_water = $this->migration->getHighWater()) !== NULL) {
+          if (isset($high_water_property['alias'])) {
+            $high_water_field = $high_water_property['alias'] . '.' . $high_water_property['name'];
+          }
+          else {
+            $high_water_field = $high_water_property['name'];
+          }
+          $conditions->condition($high_water_field, $high_water, '>');
+          $this->query->orderBy($high_water_field);
+          $condition_added = TRUE;
         }
-        $conditions->condition($high_water, $high_water, '>');
-        $condition_added = TRUE;
       }
       if ($condition_added) {
         $this->query->condition($conditions);
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/VariableMultiRowSourceWithHighwaterTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/VariableMultiRowSourceWithHighwaterTest.php
deleted file mode 100644
index 8a22224..0000000
--- a/core/modules/migrate_drupal/tests/src/Unit/source/VariableMultiRowSourceWithHighwaterTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\VariableMultiRowSourceWithHighwaterTest.
- */
-
-namespace Drupal\Tests\migrate_drupal\Unit\source;
-
-/**
- * Tests variable multirow source w/ high water handling.
- *
- * @group migrate_drupal
- */
-class VariableMultiRowSourceWithHighwaterTest extends VariableMultiRowTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    $this->migrationConfiguration['highWaterProperty']['field'] = 'test';
-    parent::setup();
-  }
-
-}
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
index 26a7e51..d625d5f 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
@@ -20,7 +20,7 @@ class CommentSourceWithHighWaterTest extends CommentTestBase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->migrationConfiguration['highWaterProperty']['field'] = 'timestamp';
+    $this->migrationConfiguration['highWaterProperty']['name'] = 'timestamp';
     array_shift($this->expectedResults);
     parent::setUp();
   }
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php
index 49ec31a..dd58692 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php
@@ -23,7 +23,6 @@ class FilterFormatTest extends MigrateSqlSourceTestCase {
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
     'id' => 'test',
-    'highWaterProperty' => array('field' => 'test'),
     'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_filter_formats',
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTestBase.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTestBase.php
index ba8129c..0b1747e 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTestBase.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTestBase.php
@@ -18,7 +18,6 @@
 
   protected $migrationConfiguration = array(
     'id' => 'test',
-    'highWaterProperty' => array('field' => 'test'),
     'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_taxonomy_term',
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UrlAliasTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/UrlAliasTest.php
index 780ed0b..dabdbba 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UrlAliasTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/UrlAliasTest.php
@@ -20,7 +20,6 @@ class UrlAliasTest extends MigrateSqlSourceTestCase {
 
   protected $migrationConfiguration = array(
     'id' => 'test',
-    'highWaterProperty' => array('field' => 'test'),
     'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_url_alias',
@@ -46,9 +45,7 @@ class UrlAliasTest extends MigrateSqlSourceTestCase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    foreach ($this->expectedResults as $row) {
-      $this->databaseContents['url_alias'][] = $row;
-    }
+    $this->databaseContents['url_alias'] = $this->expectedResults;
     parent::setUp();
   }
 
