Revert f1101f9..c6708ff

This rolls back to commit f1101f9a2e3ed896ee99a2a9a3570d8928afdb42.