Revert 28001ea..e25b8e3

This rolls back to commit 28001ea93d968db9dd66fbbc3d337c3e58b68fb0.