Revert 576bf18..d2cb3e8

This rolls back to commit 576bf189f84cd78a5ea1b829293ef1637633db7c.