Revert "Updated commits after master change"

This reverts commit 973eaadc0575bae59ae306d7190ab4f43a1375a2.