Revert 5609b51..03e0793

This rolls back to commit 5609b51fff74c9707a7b49bffa6d32853529d6c7.