Revert 802dfce..8b83f4b

This rolls back to commit 802dfcee30e17a94827ec828778df0dd2fe7e765.