Revert 16dd0a0..ef7dda0

This rolls back to commit 16dd0a0799c92c37ab370a99783b8cf5fd572f67.