Revert 8f99a43..2ad5917

This rolls back to commit 8f99a434e71cab6a12ec77e14bef9fa5a1513729.