Revert "WL-3453"

This reverts commit 3ed3d201392efac52848b6bc5e092d8da8bb26cf.