Revert "Daniel's work"

This reverts commit 66b5f389b915f7ffc5ec972af0473b2f810f6c39.