This reverts commit c881730fad. This is just a temporary solution until we can properly fix this. See #1464
c881730fad