Revert "standalone!"

This reverts commit 939264b49783827aece6d4912276681d5541fb26.