Revert 28cb30f..38711ec

This rolls back to commit 28cb30f9b0cc7d6fc223209838704008c7681e5d.