Revert this for now

This reverts commit cb443197a772307a42e724cd85daaa8831bf1f28.