Revert "commit"

This reverts commit 905a812379c1f4cd84a6a6ca552906d3e382ffd7, reversing
changes made to 2d689572b221183cfe5efb45446201f3dce6c14b.