Revert 99d6d3b..870b085

This rolls back to commit 99d6d3b7af44109dc6cfa8ef8b4cc74077deb6a8.