Revert 43fc8af..12339b3

This rolls back to commit 43fc8af8269572603aec1d334229d59e6751dbc7.