Revert f5bbe8f..1208dc9

This rolls back to commit f5bbe8f6c773d90cd7161cecc870a33ce2653bf8.