Revert "Master branch"

This reverts commit 7e0b0a7f8a2664e8374c0b7d936e06ad760f9597.