Revert ada4693..e9bf551

This rolls back to commit ada4693673a1f878e5059b77f122e28b85169c62.