Revert 6ed5baa..d4fe81b

This rolls back to commit 6ed5baabd32b0afbcface686a642686d848a6d65.