Revert changes to version 059576646ea1eca4efeff938d5e0a9a1525c5a09