Revert f07f8bc..d7a8a92

This rolls back to commit f07f8bc412f7171f7615af811983768d6fd5d622.