Revert aa15647..57b7a4b

This rolls back to commit aa1564714727f77d09e70de41c4bc46e0fa9095c.