Revert 596f69f..d9dca1c

This rolls back to commit 596f69f34ded042a35b4f5c60a50c659ca9bca8b.