Revert "Forgot these two"

This reverts commit 8c4c46db6fd4bcf3c2b0a92c4699cba320bd36f2.