Revert "Fun with Refactoring and wp-admin StyleGuiding"

This reverts commit 681a5c386df922251a4f66cd1a28156454630b05.
Fun with solvation