Revert "Fix build error"

This reverts commit 126f4c8aac7d26dfedafeba0bea87cda8ea13439.
Revert "Let it slide"

This reverts commit 140963dc330ee4b89f8341c0767ef3ec4d5e8509.