Revert 679d6e7..635359d

This rolls back to commit 679d6e7b9cfef97a7f786bc158b033d4c0e6eb6d.