removed until #1401 is fixed