Revert "rikki"

This reverts commit ecbaf8821ac4e106cbe3e1b2ab7e1c89e0aa8ce8.