Revert c5fce05..18304d0

This rolls back to commit c5fce055a90d878fabb9ea8a5c9ba88d5abfa8ec.