Revert "Rollback breakage to 81567e515707891837f52bc3aac7d5916dfff5a2"

This reverts commit a8863995dee7bcd089e1aa9a3b86cd5c749d0d65.

This should work now...