Revert ff1c487..1394a4d

This rolls back to commit ff1c487f95b38c06bb7b6fea71f5799186dd506e.