Revert ba8ae22..d384ef3

This rolls back to commit ba8ae220c357cc9f6fe8ba43ad40e09598fd1380.