Revert c1b3ebb..7466d5e

This rolls back to commit c1b3ebbe5767b2abec1a01d91e503e5c0ecbc209.