This reverts merge request !3382 (merged)
Not sure what the actual issue was but it breaks tests. cc: @rinpatch @pasture
