Revert 5c8dcf4..3aa6845

This rolls back to commit 5c8dcf48dcc5c48ffac630501fa43ad779ca92a1.