Revert 02fdc57..9373d24

This rolls back to commit 02fdc570b61d3b0a1edc174833d6f55a8c922945.