Reverted commit c704e05