Revert 710d45f..43f8345

This rolls back to commit 710d45f1508fec3a33f9c3be3489071869dda7c2.