Revert "Rollback of breaking change."

This reverts commit 352de0949711c3ec123d7bd0d5f94ee8e3238e94.