This reverts commit 5d528f83.

Relates to f8c8ad56 which is also getting reverted due to failing test.