Revert Robert's temper tantrum

This reverts commit d153fcce56f239bc2e17ee8ecaa600b84d4d3690.