Another attempt at #376.