Revert c0f2a5c..0afc6c8

This rolls back to commit c0f2a5cc518b23b07df3ab41428888e1525b5e65.