Revert "Revert "Derpin""

This reverts commit 1689a80f611afbbfad5c4b132bb0bf6d855a26d9.