This reverts commit f7ae14cd6a. The warning got fixed another way before I pushed this change.
f7ae14cd6a