Revert "rikki"

This reverts commit 68144df4a8fae4307729d1740843682070f8f49d.