Revert 1dec388..e89f414

This rolls back to commit 1dec388c393ae2027a6e660765d57fdddaf4101d.