Revert "Revert "Humoring Scott""

This reverts commit cc7d40d2dcd90366ce4cd517e1f12a767fef51a3.