Revert "Merge develop branch"

This reverts commit a3ea15a91591a593e670f9da4992efad5e01a399, reversing
changes made to 766f2391462a410166bb0affc4ca519ba91fa06a.