Revert c09676e..df04bba

This rolls back to commit c09676eb709707ea8fc217087d4b3cb0ef7f3205.