Revert bb3ab3e..7b6573d

This rolls back to commit bb3ab3e7d2a328512da03473e9b0f01b75ec19bd.