Revert "Merge branch 'master' into dev"

This reverts commit eacdb2c7893a37ebe3a5b45dea8c5796f7566046, reversing
changes made to 3c029a275967ad751ca24784310cd7aa2452b04b.