Revert 982d79d..1114548

This rolls back to commit 982d79d872daaaf31aa3bbecbebd79b6836ee4c4.