Revert erroneous revert

This reverts commit 91d281db3a5d81530cf216747b08aafa1c8846a5.