Revert efa48f6..7943a87

This rolls back to commit efa48f6b4dd1c3d25342127d6b9c96b23aefa363.
wtf