Revert "rikki"

This reverts commit 831c6ed39f5a80cf77a58435d9d308fddd43ce7a.