Revert "Revert c4332ab..60cddb6"

This reverts commit 9ee62450d016c1e08e5d69e0dc49fe140ad9a512.
format