Revert "WIP: Do not break CentOS server spec on vsphere"

This reverts commit 885786ffd63c6d67f03b1253a04b3ed662aa9d2d.
This commit failed rubocop. Revert until fixed