Revert 955cce0..b108b71

This rolls back to commit 955cce0bb57a0873a9465d5f8461fa3568eb13cd.