Revert "PLA-1482 change everything"

This reverts commit b19cf9fe37e0e6480ed27425932df691dfd48d54.