Partial revert of b09f8110dbcb8bc8a1fcdb3e9a5dddb0956aba96

Didn't mean to commit this change

Signed-off-by: Shea Levy <shea@shealevy.com>