Revert "Recommit"

This reverts commit 52e2548cf9e6fe60947adaa6952719643267665b.