Revert 35ac9de..eec466e

This rolls back to commit 35ac9def47d222b344d46685559f60626ad97e0c.