Revert 74df97d..dfa0478

This rolls back to commit 74df97d02dae7d6d64cbb6de8e2809f3e613d33a.