Revert f1f6568..1582d29

This rolls back to commit f1f65689581b27477bd85dc1e56f189d0de979d0.