Revert 0427617..d0e3a97

This rolls back to commit 042761772526bce45096f5bf2cca1ec792da78f8.
utils and others