Revert "Merge branch 'master' into develop"

This reverts commit b775ad7983610dbbb23a31f856b95114ad72e9eb, reversing
changes made to 016fb8aea4806dd80cd07a6a8aa54123772e6a61.