Revert 0ebda96..a7890f0

This rolls back to commit 0ebda968f92f89bbc4246c4538ccd8dd6d7afb7d.