Revert "Updated to master"

This reverts commit cc03c9f340a041676cb36c356817fa4305cbd69d.