Revert regression in previous commit.