Revert bfb241e..0f16e8a

This rolls back to commit bfb241eb049cc1f64a1970a1aedaee788cb85675.