Revert 3f5c8ea..76d0f6f

This rolls back to commit 3f5c8ea1292135ef5d3dfb07a424f09e64ae69ff.