Revert 22d2077..4413dd7

This rolls back to commit 22d207744e81ad916a6dfeec0e89d0f809e626ca.