Revert cbc1af7..d956c2b

This rolls back to commit cbc1af7fb1d9b3eb92035214be7ce086bf589049.