Revert "Doctrine 1 edits"

This reverts commit be32fbc8496bd33c3c899e6f55b958b12da7c1e5.
Revert "Revert "Doctrine 1 edits""

This reverts commit 94fd337a9f7667e3da1d0a88406a0d8906d725d7.