Revert 41bd4d8..ddcf138

This rolls back to commit 41bd4d87dbec802ca4b5d040950d4b6514d83669.
Changed portfolio order