Revert "Recommit"

This reverts commit d60663665f07df7c340bca6732824a74ac82054a.