1.48
Revert 8b8d301..b28d36a

This rolls back to commit 8b8d301dd3a1283657b3891d058b8c2a9e0dc062.
1.49