Revert "Broken Do Not Use"

This reverts commit cdd483f6f2c13b3dc4b017c879cc18c995ba43e0.