Revert broken merge PR #2434

Reverted merge is broken.