Revert a4d6097..3f6d001

This rolls back to commit a4d6097f13cbb01acbe8eca612e5f63a40fde585.
5ara 2