Revert ca11788..625ad16

This rolls back to commit ca117889b07d2da7c5708e043b5be57bc201b912.