Revert "Cleanup of master branch"

This reverts commit 825ca5e083ab83b7af05a7a4c82b0b08da85f74e.