Revert "More small utility improvements"

This reverts commit fdda84c5de06a0d8ad7c5cbead85f69b6093d294.