Revert 7d5beb5..8018578

This rolls back to commit 7d5beb50e31a8ec703d89c3df75bb06976f10d37.
sippai