Revert e89b86d..54a51ce

This rolls back to commit e89b86d572efcee339cd8ed7a71ded053e81666d.