Revert 38e51ba..6eb33f0

This rolls back to commit 38e51ba5a15a5f5fb43ea669c69817f022282d7d.