Revert 6157 until we can commit to 2.0 and merge forwards

This reverts commit f64b31c426b53c264e65180e858f0c283cf5edb2.