Revert 798c034..9856b30

This rolls back to commit 798c0348d7d5c310f0233b8a670b1339dfb3539f.