Revert f9788c4..9488a65

This rolls back to commit f9788c4ee857a38c993598b0a3b1fe6e45c0ec53.