Revert 5c84624033b308477cf8b7c1c9f65bc63f2b3017