Revert reason: It breaks phoenix client. This reverts commit 8dbb0b04876d746c20c661220b58b98a1a000a94.