Revert f6096c0..56a47bc

This rolls back to commit f6096c0966ce8b574da2ae72e589c7502880c169.