Revert 917a4b7..23b2342

This rolls back to commit 917a4b7241c3bf72f1ff2aa1eba0cb268b09a51a.
Rogue fikle