Revert "Take 3"

This reverts commit b450bcecfe7736d728d0cee8fe14839252edd746.