Undo last revert

This reverts commit 35db6d1edaddd025bb16f30b108f7b13866a55db.