Revert c0f57fd..34536d3

This rolls back to commit c0f57fde1ab9538b0c986bc49b8d5319c7d8e303.