Revert 8de5a56..3c770a2

This rolls back to commit 8de5a5635c66ae96abbf555f42d6578753d5d773.