Revert ad83e667b2

This reverts commit ad83e667b2f25da137162096dd16684c696e3d9f.