Revert "No more of this!"

This reverts commit 363a4d1a5a82fc68ec2c265a696c1f41a1f6b11a.