Revert 3745c56..f079d3d

This rolls back to commit 3745c56dc80e324f102dab12946b5f3594d13e0b.
minor stuff