Revert "copied out of folder"

This reverts commit 5120f48776bd9d808281f9d127f50613b64a5451.