Revert 878c9aa..cf895e5

This rolls back to commit 878c9aa94cf16b2914cf3b2913c01417ebde036f.