Revert c0f13fb..22851bf

This rolls back to commit c0f13fbddbd7636cbdeb74b2ae52eea3b0aafab4.