Revert "Master Commit"

This reverts commit 6c8afc5f5db10fee9700712095b68a9137ce82f0.