This reverts commit 76d8d3181b9464d1e1bbc713a2729ca269d9c047, reversing changes made to 31a8dc3a98d73c2707d633712f0ef7207013e78b.