Revert "From Arco"

This reverts commit a584aa9e6f4ab5d2ba5d1768e0a43c57ea9c8e76.