Revert accidental commit 20505