Revert d2b8528..daada65

This rolls back to commit d2b8528e8e408821df27653fc38c085605078f60.
Latest and Greatest