Revert 43fc8a7..feda97b

This rolls back to commit 43fc8a7f00641a1aa5add1fb9850b614b56e83fb.