Revert 7db7401..20dd865

This rolls back to commit 7db74013abbe9d1ffa062285c96a2b3dcdf7afe6.