Revert f5cf761..d33f663

This rolls back to commit f5cf76148ad937654a9f5876e90117506e7125f9.