Reintroduced a "dropped" commit

9cb0a18e6442544bc47f0e88766c9251b0d815cd
This didn't get carried over with the merge