Revert "More additions."

This reverts commit 005ceab6f41e8288c2cee16583ca8972a55f5be6.