This PR was against master, not develop :( This reverts commit 203058a0, reversing changes made to 552f123b.