Revert 4bf0ff4..bc47f9b

This rolls back to commit 4bf0ff456ca1cd5f00d8cb773ff5ae15901ca010.