Revert "Recommit"

This reverts commit 22b9e02755d3ecad6bf1d97e7c60c31e6e98c033.