Revert 426e782..28663b7

This rolls back to commit 426e782f8dfde54beb8c1abba3a1483b8e76f67c.