Revert a17c9da..6a30d23

This rolls back to commit a17c9da13b1eade70a16ac550fd7214590429d70.
Cosmetic changes