Revert commits from master

This reverts commit a47d6fb19eee91342a2fa8dc107b520c8e81865e.
Reverting commits from master

This reverts commit f340eecc73492e2f15cf96f1e662f0d8792d0880.