Revert b325337..0f88866

This rolls back to commit b3253373185b9cd1dd0e3586391f386dc0c3c906.
sippai