Revert "this is already implemented elsewhere"

This reverts commit ad2e3e987aa7f3a982fb058813af85d8daa9272d.

Still remove the duplicate though