Revert 0d19d57..6bf47bd

This rolls back to commit 0d19d5798baa9cd35decc27a6798d7101ee18dbc.