Revert e7f6343..0c97d31

This rolls back to commit e7f6343e988d52f39bc0940ef7239d93cb92a613.
wtf