Merge pull request #3035 from yanesca/revert_pr_3011

Revert "Merge pull request #3011 from Patater/dev/jp-bennett/developm…