Reverted last update back to 4.0