Revert 7ce0978..c7f97ac

This rolls back to commit 7ce0978739426b76eac86d763510ebb84ac17e8f.