Revert a1efb5c..469d568

This rolls back to commit a1efb5cd9622153f98d7143ba7a5f2774d52fa03.