Found it! Somewhere along the line I thought it was a good idea to uncomment this line in Config/core.php
:
Configure::write('App.baseUrl', env('SCRIPT_NAME'));
But this is for when url rewriting is NOT enabled, so putting the comment back in did the trick!