Revert 7819384..8b66a04

This rolls back to commit 7819384d5125f32e1cdaaa9881ae1f57f79a8e51.