Revert a78087f..2b16c46

This rolls back to commit a78087fe4cd5f91a6b11fe6b112bfde3be4c1a1f.