Revert "Revert "Not needed""

This reverts commit 87febec259808d83bf69d8444b79d7689eb7ce65.