Revert "Plock-i-fy"

This reverts commit 970db9d959a10bbc6b478d288d6be365dfef2738.