Re-attempt broken commit

This reverts commit 82d5d0f8a55643a903588cfb77b13b2a16362ded.