This should no longer be necessary (starting from 0.16.2).