Revert 8d53561..a3ff0d0

This rolls back to commit 8d535619415fc4b39002374c2afaa388a11a578f.