Not sure why I changed this

Partial revert of 4ce791e9766f2f31ee0499e14bae9b0d6d5c12a4