Revert. This isn't the correct way to go.