Revert "Master Commit"

This reverts commit 2dfc7ce7827c413b78a242e766ced94b773661e6.