Revert abafd8e..a377ee3

This rolls back to commit abafd8e7a40c4425c7efabb3a74c2d20d2100d46.