Revert 7120ed6..644f0f0

This rolls back to commit 7120ed67e0458e965a865316f36e57c2d6c76185.
Old stuff