This is a temporary fix until #1568 is accepted.