Revert 9fb3cbd..a96a651

This rolls back to commit 9fb3cbdb9f6ce2f59d5976e975f230b4d8f65c50.