Revert 6addb51..05470be

This rolls back to commit 6addb513c771f0b647052016d64d059a5a686f5f.