Revert "Standardization Effort. Part 1."

This reverts commit e4b9db0bd4bf5cdabbd045b0abac79613b7307fa.